Fixed all checkstyle issues
Version 0.0.7.2