Merge pull request #97 from ramonvermeulen/patch-1