Merge branch 'hotfix/0.2.4'
Update changelog and bump version to 0.2.5
Check if total scale query has rows before fetch
Merge branch 'hotfix/0.2.5' into develop

Conflicts:
	README.md