Small method fixes
Rework of method (lots of changes)
Merge branch 'master' of https://github.com/tkok/GSD-report