Merge pull request #7 from arnaudgaudin/master

Master