Merge pull request #115 from amatellanes/master

v1.6.2