#15 fixed
#15 review fixes
Merge pull request #24 from krzyk/15

#24: pull request #15 fixed