Bug fixes, issues 80, 81
Merge pull request #155 from NJR44/BugFixes-80-81

Bug fixes, issues 80, 81