Version 1.0.9 + cleanup