Final done with all the changes as a distributable version