Added Statistics module
Fixed Merge conflicts