Added a check to make sure credentials are have limited enough file system permissions
Merge branch 'master'