add maker-mode
Merge pull request #2096 from fommil/master

add maker-mode