Integration fix for issue #51
Merge branch 'master' of https://github.com/nasa/coeci-cms-mpsp