Added support for loading marker images.
final fix then a merge next.