Bug fix
Merge pull request #12 from sampo02/masaki/work

Bug fix