Small change to headers
Merge origin/master
Merge origin/master
Renamed a couple of classes to a more streamlined convention