update to 2.6.2
Merge pull request #299 from hluu/master

update to 2.6.2