Merge pull request #1 from Geodan/master

merge from master
ignored .idea folder
Merge pull request #23 from MartijnHeuff/master

Merge pull request #1 from Geodan/master