Additional 0.4.8 work
Merge pull request #70 from TechCavern/master

Additional 0.4.8 work