v.1.2 Ready to release

All changes between versions 1.0.2 and 1.2 merged