Merge pull request #126 from IMOD-ASU/development

Sprint 8