chris-wood Merge pull request #88 from kaduk/finalize