Merge pull request #291 from paulgear/master

API additions and updates; minor tidies