pull 0.1 into master

Master wasn't really the master anymore, so time to update it!