Update for 1.6.2
Merge pull request #168 from forairan/master

Update for 1.6.2