Problem 18 started.
Merged master