the colorscale in the bundle still not working, I will work on it this weekend
Merge remote-tracking branch 'origin/master'