fixes
Merge pull request #4 from koxon/master

fixes