Merge pull request #149 from stevenvanrossem/master