fixed regexp for <width>x<height>, height is optional even if x is present