More fixes
Merge pull request #41 from JasonSwindle/master

More fixes