Further divison of labor added.
Merge branch 'master' of https://github.com/flyingcircle/Capstone