changed function to get user_id
Merge branch 'dev'