Remove output()
Merge branch 'develop'