Merge pull request #6 from Draedalus/master

Merging Master into local
Remade changes from earlier botched commit and push
Merge pull request #7 from Draedalus/Local

Changed file names for future change in activity