Merge pull request #136 from stevenvanrossem/master