Pull request to master the same which was sended to dev

PMD and checkstyle all done.