Merge remote-tracking branch 'upstream/master'
misc.
Authorization bug fix
Merge pull request #70 from madhushib/master

authorization bug fix