Merge pull request #24 from stevenvanrossem/master