Merge pull request #218 from stevenvanrossem/master