Merge pull request #106 from stevenvanrossem/master