Merge pull request #148 from jasobrown/1.1

Avoid recursively calling self; instead call outer class's getCredentials()