Merged in hotfix/auth_arg (pull request #5)