Merge pull request #99 from stevenvanrossem/master