Merge pull request #132 from mabrains/finalize_all_varaints