Merge pull request #217 from stevenvanrossem/master