Merge pull request #75 from stevenvanrossem/master