WSOTWO-94: Added javadoc
Merge branch 'master' into WSOTWO-123