Updated for 1.6.4
Merge pull request #7 from AesGH/master

Updated for 1.6.4