Account for edge case
Merge branch 'master' of https://github.com/ziyuanliu/nyzr