Merge pull request #90 from stevenvanrossem/master