Reverting to previous logic that got lost in a merge, but retaining safer underscore variable syntax
Merge pull request #48 from postcode/fixing-truncation

Reverting to previous logic that got lost in a merge, but retaining safer variable syntax