Merge pull request #58 from DZCP-Community/bugfree

Update Final
Merge pull request #60 from DZCP-Community/final

Merge pull request #58 from DZCP-Community/bugfree