output-module update
Merge pull request #24 from Xzed93/master

output-module update