Merge

Fixes bug in registration and adds the option for fast blending (experimental).