Minor changes
Merge branch 'master' of https://github.com/satnet-project/satnet-release-1
Minor merge changes.