Commands

Merge commands branch into master