Added up to 2.18 (skipped 2.13 - 2.16 for now)