Fixed columnsFromQuery and tableNameFromQuery bug on multi line queries
Merge branch 'origmaster'

Conflicts:
	CHANGELOG.md