Merge pull request #87 from dejan-brkic/master

Documentation updates
Merge pull request #88 from dejan-brkic/master

Fix documentation config bug
Merge remote-tracking branch 'upstream/master'