bug fixes after demo
Merge remote-tracking branch 'jgpaiva/statistics'