New version
Merge pull request #246 from mbaz/Gaston

New version