Merge pull request #36 from rjmackay/develop

Minor API tweaks