Merge pull request #75 from fix8/dev

Dev to Master, pre 1.1.0
FX-230
FX-203, FX-195
Corrected doxygen typos
Merge branch 'dev' of https://github.com/fix8/fix8 into dev