Fixes according to BEMINFO-445
Merge pull request #183 from jk708/images-https

Fixes according to BEMINFO-445