Removed some bugs: failure to escape & and binary files (kindof)