included andre's changes
Merge remote-tracking branch 'origin/master'
script tweaks, image tweaks