Add Javadoc
Merge pull request #61 from adoulrac/smandrau/release2

Add Javadoc: Javadoc added (+minor refactoring)