fixed some issues
Merge branch 'master' of https://github.com/li7/Ptpd1-object-oriented