Code amended - not working yet
Merge branch 'jisaeva' of https://github.com/datashield/dsMxClient into jisaeva