Bug fix in 1-dimensional queries
ups

Merge branch 'master' into stable

Conflicts:
	R/loadECOMS.R
test
Merge pull request #1 from SantanderMetGroup/stable

Stable