Moved 0.2.0 stuff into this repo because it was messed up before :(. Oh well
Merge branch '0.2.0' into develop