Merge pull request #2 from jvazquez-r7/pr_2536

Synchronize rapid7#2536
Add the ARCH_CMD target