Merge pull request #58 from DZCP-Community/bugfree

Update Final