Merge branch 'master' of https://github.com/rub-a-dub-dub/SCAPack

Pulling from head of branch to correct some commit metadata.
Merge branch 'master' of https://github.com/rub-a-dub-dub/SCAPack
Pull to amend commit metadata