Merge branch 'jp_leo' into jpbranch2
Merge branch 'jpbranch2' of github.com:Cratez/red-shiny-gem into jpbranch2