Bug fix: add input stream line
Merge branch 'dev'