Issue #174 - Finalize