Merge remote-tracking branch 'upstream/1.7'
#116
Merge pull request #117 from lipki/#116

lipki #116