Merge pull request #30 from lbl-srg/release

Update master with release
Merge pull request #31 from lbl-srg/master

Merge pull request #30 from lbl-srg/release