Checkstyle fixes
Merge branch 'master' of https://github.com/memo1012/swa.git