Should not be using access_tokens in class variables
Merge remote-tracking branch 'origin/master'