Update for the latest version - 2.6.4
Merge pull request #3 from bshaw/master

Update for the latest version - 2.6.4