Merge 0.2.1
Write tests that please V