Version 1.0.9 with 2 fixes