local branch
some fixes
Merge pull request #52 from DrScKAWAMOTO/issue30

Issue30