added javadoc
Merge branch 'nick'