Merge pull request #74 from stevenvanrossem/master