Merge pull request #555 from neheb/ks