finished 17 and 18 time for 19 and 20
Merge remote-tracking branch 'origin/master'