Javadoc
Merge pull request #443 from delbouki/documentation

Javadoc