Last minute changes
Merge branch 'master' of https://github.com/Gaspi/report
merge