Merge pull request #197 from nate-yocom/master

Minor fix - use conditional QI table based on usage scenario