Authorization Improvements

Fixes #16.