Checkstyle contribution
Merge pull request #189 from rage/master

Checkstyle contribution