Issue #149 - Add GET user id functionality
Merge branch 'userid' into develop