Merge pull request #2 from takeda/master

Syncing with takeda/ndnvideo
Merge remote-tracking branch 'remap/master'
Better interest timeout calculation.