merge colorbitch's pull request
Merge pull request #2 from colorpeach/master

merge colorbitch's pull request