Fix issue #29
Merge branch 'master' of https://github.com/loupyestu/PUMIR-H3T2