Merge pull request #23 from Geodan/master

pull request 20140325
Merge pull request #252 from MartijnHeuff/master

Merge pull request #23 from Geodan/master