Patch changes and adding a new version of tarball #2

Merged
tigro merged 2 commits from :i9-beta into i9-beta 4 months ago