Fix manifest (missing entries)
Merge branch '0.2.0'