Merge branch 'add-stdin' into HEAD