Removed reference to PR
Fixed bug in _token_set
Merge pull request #18 from yolesaber/master

Fixed return value of _token_set when given an empty string
Merge remote-tracking branch 'upstream/master'