Version 0.0.4 complete