Corrected timer for PIN and reduced countdown
Merge remote-tracking branch 'origin/master'