FX-203
FX-203; tidyups
Merge pull request #74 from fix8/master

Master to Dev
FX-203 - made optional
FX-195, updated doc for methods using doxygen
Merge pull request #75 from fix8/dev

Dev to Master, pre 1.1.0