Enhancements sugested by andyt (NO J#)
Merge pull request #1 from photobox/andy_suggestions

Enhancements sugested by andyt (NO J#)