Merge pull request #94 from stevenvanrossem/master