Lowercase commands for consistency
Merge branch 'dev'