Bug Fix

Some bugs are fives
Merge pull request #1 from hiromichi/Develop

Bug Fix