Follow changes
Merge branch 'master' of https://github.com/evanhuang8/Span
Edit follow up