Merge pull request #75 from tijmenvandenbrink/master