Merge pull request #125 from jllodra/master