Basic config done.
Merge pull request #1 from hiway/develop

Basic config done.