Adds input function
Merge branch 'dev1'