Finish user story #36