Merge latest changes

feature Two-color Area Series