Merge pull request #2 from TFcis/stats_dev

merge 4/OCT '14 (2)
Merge pull request #3 from TFcis/NewArchitecture

Merge pull request #2 from TFcis/stats_dev