Merge branch 'master' of github.com:hollie/netnode

 Author:    Lieven Hollevoet <hollie@lika.be>
Merge branch 'master' of github.com:hollie/netnode