Most of bug fixed
Merge pull request #3 from AceMNT/develop

Most of bug fixed