Patch 1.06

Using 1.03 as starting point