Develop

Merging in from @jamlen changes for the convenience methods and bumping the version