Merge pull request #54 from oliverds/master

CDN images
Merge remote-tracking branch 'upstream/master'