file input explained
Merge branch 'release/0.1.1'
merge conflict solved: first paragraph of README.md rewritten