fix stream and template
Merge pull request #26 from otiai10/develop

fix stream and template