Merge pull request #143 from stevenvanrossem/master