Integrating RichMarker for suggestions. Close #112