Updated for 0.2.0 release