General configuration and cleanup
Merge pull request #1 from zanui/setup

General configuration and cleanup