rename and refactor
Merge branch 'master' of https://github.com/danjohnson3141/conch