Merge pull request #224 from stevenvanrossem/master