moved commands to be more consistent with rest of app
uncomment with correct name
Merge pull request #1 from kr/master

pr from kr/hk