Merge pull request #110 from stevenvanrossem/master