A couple of extra api changes
Merge pull request #1 from mcfedr/api-additions

A couple of extra api changes