fixed new bugs
fixed new bugs, version bumped
Merge pull request #28 from NHQ/master

version bumped