End of Sprint (v0.2.0) Merge