added changes by mrnejc (more than one command)