Updated for release 0.93