Merge pull request #21 from tuluse/master