paulrouget Merge pull request #118 from perlun/patch-1