Fixes/0.26

Creating fixes/0.26 branch