Ooiion 1516 rebase2

@jamie-cyber1 Jamie please merge this before the pull request to add the new version of the library