Merge pull request #195 from einhverfr/1.4

quiets warnings on numeric comparisons
Merge pull request #198 from einhverfr/1.4

1.4, merging shipto fix from 1.3
Merge pull request #46 from ledgersmb/1.4

1.4