Updated configuration
Merge branch 'master' of github.com:offlinehacker/ethertest