bug fixes
Merge pull request #130 from akumetsuv/master

Bug fixes