Fix alignment for 32-bit go

Fixes github issue #141
Merge pull request #143 from dougm/cli-fix

Fix alignment for 32-bit go