Merge pull request #20 from pcarenza/jb-mr1

Jb mr1