fix issues and implment missing function
Merge branch 'master' of https://github.com/Super-Warrior/itms