Javadocked and fixed checkstyle
Merge origin/master