Merge pull request #188 from mhotan/mh_beta_devel

Initial attempt to fix Jenkins bugs
Merge pull request #190 from mhotan/mh_beta_devel

Attempted to complete Library Jenkins bug fixes