Merge pull request #20 from gregorybesson/master

Master