Merging strand_plot to master