added encoding
Merge branch 'master' of github.com:OMMatte/intnet-lab-4

* 'master' of github.com:OMMatte/intnet-lab-4:
  sgfsga