Staging - updated for v.0.0.2 release