Options

Added option to change marker and guarded against short names and empty
marker.