Solution updated to commit b379b11ddf