Updated for 0.0.4 Release