fixes
Merge pull request #6 from DaaOtt/master

fixes