Merge branch 'master' of https://github.com/Etsitpab/JSM
Minor modifications.
Merge branch 'master' of https://github.com/Etsitpab/JSM