return instead of echo, update 1.0.1