GPSCAFFOLD-82 - Don't assume id is a Long
Merge pull request #12 from jeffbrown/GPSCAFFOLD-82

GPSCAFFOLD-82 - Don't assume id is a Long