proposal
Merge branch 'master' of http://github.com/epoch/wdi_conf
Merge branch 'master' of http://github.com/epoch/wdi_conf
Merge pull request #7 from jammiii/master

proposal