Cris branch

This is awesome - check it out and merge it