Final mods to add live output support
Merge pull request #2 from paco3346/add-output-support

Final mods to add live output support
Fixed merge conflict