Fix for Issue #72 and #73
Merge branch 'master' of https://github.com/nasa/coeci-cms-mpsp