Merging gnehzr's changes with cubing/.
faster!