updates and fixes
update fixes
fixes
fixes
Merge pull request #40 from SGover/master

merge