Fixed merge issues
Merge pull request #15 from robinvierich/robin2

Fixed merge issues