Added double-quotes around variables to prevent some shell injection possibilities