Merge pull request #22 from KellyBlack/Dev

Merged changes from multiple sources and deleted aux files.
Merge pull request #29 from CarrieRider/Dev

Dev