update into Torrent branch

not sure if this will work... merge failed!