make code simpler
Merge branch 'master' of https://github.com/psjava/psjava.git
add debug code
improve map performance
fix debug code
add comment
refator-rename
rename, small refactoring