Updated configuration
Fixed a few bugs
Merge branch 'master' of github.com:offlinehacker/ethertest