Merge pull request #273 from criedel/master

Thanks !!!
Merge pull request #274 from criedel/master

Thanks !!