Create output class
Merge branch 'output'