Add javadoc
As per Aslak's comments
Merge pull request #694 from timp21337/scenarioJavadoc

Add javadoc