Finished TODOs
Merge branch 'master' of github.com:petrs/WSNProtectLayer