keyboard change + keyboard close when clicking calculate
Merge remote-tracking branch 'origin/master'