Version 1.2

Big changes