Update from upstream, up to 1-st Oct
Merge pull request #42 from sshnaidm/new62

Update from upstream, up to 1-st Oct