To be pulled to Nicole's repo
Merge pull request #6 from LANL-COSIM/nicole_new_branch

To be pulled to Nicole's repo