Add 1.18 and 2.15 by Julien Vaes