Updated javadoc

Added short info in the javadoc for the main how to select the features.
Merge branch 'release-0.1' into develop