Hot fixes
Merge pull request #28 from agudulin/bugfix

Hot fixes