Reintroduced  which was deleted during merging conflicts. 3649c72ee4
Merge pull request #53 from fdammeke/master

Reintroduced  which was deleted during merging conflicts. 3649c72ee4