Merge pull request #2 from jessp01/minor-fixes-and-ci Minor fixes and ci
Merge remote-tracking branch 'origin/master'