Porting over changes
0.2.0