merging pull req 397 - Fix #1546 Cannot Download Pictures