Changed files names
Changed pem file name
Increased timeout
Merge remote-tracking branch 'origin/master'