Update to version 1.7
Merge pull request #115 from rnc/master

Update to version 1.7