Update for new API

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>
Install latest version from source

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>
Implement working version

Signed-off-by: Michael Barton <mail@michaelbarton.me.uk>
Merge branch 'updated-api'