Merge pull request #228 from stevenvanrossem/master