Updated for release 0.12.1