b3369f Merge pull request #256 from skitaoka/fix/issue/253-254

Merged and Committed by tomosu 9 years ago
    Merge pull request #256 from skitaoka/fix/issue/253-254
    
    Fix issue 253-254