Merge branch 'develop'
rm tmp for now
allow the command to be altered via a listener
Add unset methods in command
Merge branch 'master' into develop