manual changes to branch since it wont auto merge anymore ...
Merge pull request #23 from lilfade/dev

manual changes to branch since it wont auto merge anymore ...