Bug Fixing
Prep for 0.0.4