Merge pull request #27 from stevenvanrossem/master