Merge pull request #147 from tbouron/tbouron-patch-1