#10
#10
#11
#11
fix #12 and code cleanup.
fix #12 and code cleanup.
change to public #7
change to public #7
#13
#13
fix #14
fix #14
fix NPE #14
fix NPE #14
refactoring
refactoring
#15
#15
#16
#16