remove 'return undefined', not working as expected
Merge branch 'master' into keep