Committing solution for selftest 10.
Moving a file.
Merge origin/master