fixs from last commit
Merge pull request #16 from mitkniL/master

Fixs from last commit