Solve issue13
Add final solution