Merge msarchet/patch-1 with parenthesis fix in location calculation.