Merge pull request #1889 from bmorrise/dev

[BACKLOG-195] Fixed a few small bugs and document formatting