settings screen have been added;
Merge remote-tracking branch 'origin/master'