Double import
Merge pull request #17 from Jaiglissechef/patch-2

Double import
Merge remote-tracking branch 'upstream/jb-mr1' into jb-mr1