Added some functionality to report flow
Merge remote-tracking branch 'origin/master'