update to 2.6.3
Merge pull request #357 from hluu/master

update to 2.6.3