Merge pull request #12 from gregorybesson/master

Master