Merge pull request #145 from PierreGambarotto/master