Merge pull request #1 from dnbard/master

Pull upstream.
Updated 100K color.
Merge pull request #69 from larz0/master

Updated 100K color for #68.