Merge pull request #98 from ecorrons/master

Version 2.17.0