06.04, 08.05, 08.10
Merge pull request #11 from mikem5/master

06.04, 08.05, 08.10