More Fixes
Merge pull request #25 from SamCroswell/master

More Fixes