added alg_generic from loom
resolved merge conflicts