Merge pull request #126 from stevenvanrossem/master