Version 1.12

Merge back in