Adding support for auth for issue #1