merger master
merger master & enable checkstyle pmd findbug