improve JavaDoc
fix coding style : variable name should not contain an underscore
rename Ariadne_Location to AriadneLocation
Merge branch 'master' into maven
wrap long lines
Merge branch 'master' into maven