rafactor code
Merge branch 'develop' of https://github.com/rubikill/JavaPhanTan into develop