FIX for issue 12, Added another command