Merge pull request #227 from wongoo/release-v1.7.0

Release merge for v1.7.0 (based on v1.6.0)