added missing paren
resolved conflict
Merge pull request #28 from beck410/king

King