forked and updated echowrap gem