Merge pull request #2 from AubG/master

Update: master branch