Merge pull request #20 from palmer-dabbelt/package