add stat and stat_types
Merge branch 'master' into add_stats_as_joins
stat functionality
Merge pull request #2 from Onikoroshi/add_stats_as_joins

Add stats as joins