Merge pull request #1 from zencart/v160

apply changes