Add message input

merge to master