move output to target
move meta to class
Merge branch 'master' into develop