Some fixes
Merge pull request #5 from VEINHORN/develop

Some fixes