cleaning some more checkstyle
+ LICENSE
Merge origin/master