little tweaks from Fergal
Merge branch 'master_dev'