as per previous pull request
Merge pull request #13 from niekdegreef/patch-2

as per previous pull request