Merge pull request #28 from stevenvanrossem/master