Merge branch 'master' of https://github.com/SCS-CBU-CED-IAM/allin-cmd