Updates:
 - Key input added
 - @author added
Merge remote-tracking branch 'origin/master'