fixes
Merge pull request #1 from lakoza/master

fixes