merge colorbitch's pull request