Added interim changes since NDNx v0.1