Merge pull request #211 from stevenvanrossem/master