adaptive-fix
Merge branch 'dev' of https://github.com/NoMoreMarking/cj into dev