Merge pull request #23 from jrri/master

scj: Porting of hijac's L1 version of CDx to JOP