Merge pull request #199 from stevenvanrossem/master