Merge pull request #101 from stevenvanrossem/master