Correction of little bugs in the application
Merge branches 'master' and 'correct_little_bugs'