Merge pull request #12 from lbl-srg/master

Merge master to release branch
Merge branch 'master' into release
Merge pull request #23 from lbl-srg/release

Merge release