edited for junii2 version 3.1
Merge branch 'junii2-3-1' into customized