Update User and Organization ID. Closes #5 and closes #6.
Merge branch 'enhanement-#6' into develop