Put a temp fix to issue #61
Merge pull request #65 from ryojiosawa/bug#61

Put a temp fix to issue #61