Merge pull request #28 from lbl-srg/master

Update release branch with latest changes.
Merge pull request #29 from lbl-srg/master

Added bug fix of pull request #27 which caused self._nPro to be disregarded.
Merge pull request #30 from lbl-srg/release

Update master with release