Updated for release 1.2.1