fix #17 - maybe not the right right way, but better then before
Merge pull request #20 from mkoryak/master

fix #17 - maybe not the right right way, but better then before