Updated scaladoc and added syntactic sugar.
Merge branch 'master' into develop