Update to v1.2, added compatibility with v1.6