Maven Code Refactoring
Merge origin/master