Need to include value list to avoid extra computation
Merge pull request #100 from cmc333333/limit-values

Need to include value list to avoid extra computation