Merge pull request #200 from timschofield/develop

Simplify query
Merge pull request #201 from timschofield/develop

Develop
Merge pull request #202 from timschofield/develop

Develop
Merge pull request #203 from timschofield/develop

Develop
Merge pull request #204 from timschofield/develop

Code formatting changes from Phil Daintree
Correctly quote the Manual links
Merge pull request #205 from fahadhatib/develop

Correctly quote the Manual links