Added optional 1.2
Ported full functionality of 1.2