Merge all of the v0.1 code changes into master