Bugfix: make sure we return, otherwise the code below will be executed, because the output-method doesn't stop code execution anymore
Merge remote-tracking branch 'upstream/master'