Merge pull request #1 from kuali/master

update from KC