Merge pull request #1 from cavedude00/master

merge
Removed Merc codes.  Will need to run cmake again.
Merge pull request #62 from regneq/master

Removed Merc codes.  need to rerun cmake