Better way of splitting the commodity from the value.
Should allow no spaces between commodities and values.
Merge commit 'f8bec00d0b7487c4afe56a4f994e69ec8e91af8b' into next