Fixes #286 - api documentation now markdown formatted.
Merge branch 'master', resolved conflicts from previous commits.
Merge branch 'enhancement/286'