Merge pull request #443 from lilyfan/issue161

Fix issues #161 and #162
Merge pull request #444 from lilyfan/issue232

Fixed issue232
Merge pull request #445 from lilyfan/issue355

Fixed Issue355
Merge branch 'master' of https://github.com/hzahoori/Tarboz into Tarboz_w9