#112 | Escaping arguments better