Merge pull request #117 from jllodra/master