Modified for exoscale
Merge pull request #2 from brieweb/master

Modified for exoscale