Merge branch 'aloha.git/master'
Commands added, testing started