1.3

Merging 1.3 into the main ready of 1.3 release