Deriche branch

Pulling down working deriche branch to master