Minor typo
Updating for a4
Merge branch '0.2.0-a4' into 0.2.0-branch