Fix/merge popen and shell variant