Fix issue#370 and issue#388
Merge https://github.com/hzahoori/Tarboz into issue370

Conflicts:
	index.php
Merge pull request #422 from lilyfan/issue370

Fix issue#370 and issue#388