fix...
Merge remote-tracking branch 'refs/remotes/Manu/master'
Merge pull request #7 from MarcSpicker/master

Fix