Merge pull request #135 from fpapon/jbake-remain

Jbake remain