Merge pull request #154 from stevenvanrossem/master