Xav83 Merge pull request #29 from Xav83/day18