perfected finalize
Merge branch 'master' of https://github.com/pvgorp/AD2SC