Cleaned up image URL request, made it more flexible
Merge branch 'feature/ph-cleanup' into develop