V1.05

OK @cmillion, ball is in your court :)  Ready to merge into master.