Fixed markup so documentation can be built.
Merge pull request #634 from guidog/master

Fixed markup so documentation can be built.
Fixed silly port number.
Merge pull request #635 from guidog/master

Fixed silly port number.
Merge branch 'master' into master-sonar