fairly big commit
Merge branch 'master' of https://github.com/BergarSimonsen/BNDN-Project