Updating to Adams branch
Adding comment line to DEMO to control some configurations
Merge pull request #110 from dbetebenner/master

Minor additions updates