Long awaited improvements
Released v1.1.2