Added rainbow, Fixed heidrichSeidel
Merged from rainbow