Collapsing Release 0.0.2 branch into master