Merge pull request #96 from stevenvanrossem/master