Merged my checkstyle branch to master, fixed some merge conflicts