Initial commit
Back to 1.2
Merge with previous repo