Merge pull request #5 from named-data/master

Upstream from Gerrit