Improve doc

Doc improvements
Merge branch 'master' of github.com:Daisuki91/projetpoo2014