Merge pull request #2 from JamesGlover/next_release

Schema Changes
Merge pull request #4 from JamesGlover/next_release

Merge in Schema Changes
Merge pull request #5 from JamesGlover/next_release

Convert id to sting before querying