Refactored, tested, fixed
Merge branch 'master' of https://github.com/nicolaikruger/Oz_fra_BNDN-BSUP