Switch to new simpler API
Merge pull request #1 from matthew-andrews/simpler-guid

Switch to new simpler API