first commits
new files
fix by day
adding test - Fixed #234 #175
add file
Merge branch 'aggregation' into develop