A bit of refactoring but mostly Javadoc
Merge branch 'master' of github.com:vinceseguin/guide