Add usage comments, Add token
Merge remote-tracking branch 'origin'