added score asking...
Merge origin/master