Merge pull request #137 from stevenvanrossem/master