FX-230
FX-203, FX-195
Corrected doxygen typos
Merge pull request #78 from fix8/dev

Dev to Master, pre 1.1.0 v2