Merge pull request #198 from stevenvanrossem/master