Merge pull request #596 from YiboDuan/master

Link match review and add Entity creation handling in logs