Merge pull request #253 from kevinli7/master

Update for v0.5.26 release.