Make soft keyboard work on phone
Switched to DecimalFormat
Merge remote-tracking branch 'origin/master'