New command restrictions!
Merge branch 'master' of https://github.com/p-slice/AMP-1001