Updated for release 0.0.3