Merge pull request #278 from wade1012/dev

Dev Wade
update conf file
Merge pull request #279 from forumbyr/master

update conf file
Merge pull request #9 from cnnic/dev

Dev