bug fix
Merge pull request #28 from maxziv/master

bug fix