[v.1.2] Version 1.2 ready to release!

Fixed merge conflicts