fixed crash when hitting enter
Merge remote-tracking branch 'origin/master'