fixes
Merge pull request #32 from Leon-G/master

fixes