Code tidy
Publishing version 1.2
Merge v1.2