Merge pull request #308 from liangfeng/master

Refix #293 for <Leader> and <LocalLeader> mappings