Sgt6700

Hi Delio - can you merge these changes to "master"