Merge pull request #1 from shreddd/master

Update LICENSE
Merge pull request #4 from NERSC/master

Merge pull request #1 from shreddd/master