Merge pull request #44 from bwhacks/alignment-fixes