Forgot a return value... so lame
Merge remote-tracking branch 'origin/v5' into v5
Merge pull request #137 from frifri/v5

V5 - 5.1.0