Manual merge into new repo
Merge pull request #1 from uh-nmb/master

Manual merge into new repo