configs from Shih-Chuan
Merge pull request #65 from dnash86/master

configs from Shih-Chuan