[Ticket #25] [Ticket #26] Updates for v0.2.0