Merge pull request #151 from stevenvanrossem/master