merge
Merge branch 'hasancelik-ClientCheckstyle'