Merge pull request #30 from lbl-srg/release

Update master with release