Issue #25
ssue #25 - fix checkstyles
merge with master
Merge pull request #29 from lthuangiang/master

#29: pull request Issue #25 was implemented