Merge pull request #225 from stevenvanrossem/master