zihaomu Merge pull request #1016 from zihaomu:nanotrack