Updates
Merged changes from origin
Addressed checkstyle issues