Merge pull request #13 from v4l3nt1n/dev-valen

data handler
Merge branch 'master' of github.com:v4l3nt1n/reporting
Merge pull request #16 from v4l3nt1n/dev-valen

Merge pull request #15 from v4l3nt1n/dev-maru
Merge pull request #18 from v4l3nt1n/dev-maru

Merge pull request #17 from v4l3nt1n/dev-valen
fix merge