Merge pull request #109 from stevenvanrossem/master