Bug fixes
Merge pull request #17 from shugox/master

Bug fixes