compatible jdk6
Merge origin/master