Avoiding NPE when the @SupportCredentials is not provided.
Removing unnecessary configuration.
Merge pull request #136 from pedroigor/master

Some small improvements.