Merge branch 'master' into tricolor
remove duplicate code
fix typo
Merge branch 'master' of github.com:escherba/warp