Solve hole 3
Merge in master