jelu Merge pull request #107 from jelu/release/1.7.0