Merge pull request #80 from red-freak/feature/echo-to-file

Merge pull request #80 from red-freak/feature/echo-to-file #42