Update to 1.6.4
Merge pull request #167 from mcmonkey4eva/master

Update to 1.6.4