Feature/issue 475

Implements #475 , which makes shuffling unnecessary, and adds the -pipe option to CFLAGS