More Fixes
Merge pull request #3 from Aperx/master

More Fixes