Merge pull request #600 from SCIInstitute/algoBaseChanges

Algo base changes
Merge branch 'master' into portCaching