Change input to a textarea
Merge branches 'master' and 'wip'