removed stuff/rewrote etc
Merge branch 'master' of https://github.com/roris/sniffgiko
removed stuff/rewrote etc