Fixing more things
Merge pull request #3 from LockeWatts/master

Fixing more things