Merge pull request #23 from williamspatrick/update_for_ken

Update for ken