Add summary
Merge branch 'feature/summary' into develop