Add additional API functionality added by jonyt
Merge in branch with additional user functionality