Bug sorted.
Merge branch 'agaye' of https://github.com/datashield/dsbase into agaye