Fix 030 and 036
Make new epub