Few code changes
Merge branch 'master' of github.com:heynemann/bzz