Merged blur.rs to master