Merge pull request #23 from tuluse/master