Pull v0.1 to master

Need to pull v0.1 over to master before commiting more new stuff.