fix for #335
Merge branch 'pr/336' into evaluate-pr-336
Merge pull request #369 from mattrjacobs/evaluate-pr-336

Manual Merge of #336