Bugfix2, part1
Bugfix2, part2
Merge pull request #2 from jeffbeck/Bugfix2

Bugfix2