Added annyang voice commands
Fixed merge