Merge pull request #1 from NPellet/master

update from npellet
Merge pull request #1 from andcastillo/master

Merge pull request #1 from NPellet/master