Fixing stuff
Deleting old stuff
Merge pull request #2 from LockeWatts/master

Pull