Merge pull request #131 from stevenvanrossem/master