latest fixes
Merge pull request #7 from Kenneth-T-Moore/master

latest fixes