fix merge
Merge branch 'master' of https://github.com/antoninab/e-n
function return matters
Merge branch 'master' of https://github.com/antoninab/e-n