added problem 7
Merge origin/master