Ensured proper links to images whether on virtual server or not
Updates
Merge origin/master