basic conf
Merge pull request #1 from mudman221/dev

basic conf