Issue 516: Updated initial commit
Fixed checkstyle warnings
Merge pull request #788 from sanai56967/516

#788: pull request Issue 516: Updated initial commit