Updated for v0.7.0 release :D