Merge pull request #2 from shreddd/master

pull in changes from master
Merge pull request #5 from NERSC/master

Merge pull request #2 from shreddd/master