Merging commits
Merge branch 'master' of https://github.com/CsmithSD/IO_Soft_Eng
No known bugs. Documentation still needs to be finished.