Merge "Updated to better distinguish between options and operands"