Fix issue#359
Merge https://github.com/hzahoori/Tarboz into Tarboz_issue359

Conflicts:
	entryview.php
Merge pull request #395 from lilyfan/issue359

Fix issue#359