Resolves issue #17. Adds some modularity
Merge branch 'master' of github.com:chesstrian/stats001