Trying to fix variable from and to widths, very ugly fix so need to refactor, added spec for coverage
Merge remote-tracking branch 'origin/master'