Made changes to allow the change from "sessionHash" to "session_hash"/some style edits
Merge origin/master