changed to use custom token session to prevent memory leaks
Merge remote-tracking branch 'origin/master'