These back and forth merges from gh-pages are tiring me.
Merge branch 'master' into gh-pages
Added dimming feature
Merge branch 'master' into gh-pages