Fixed many bugs.
Merge branch 'master' of https://github.com/ennetws/ddtt-dev