Merge pull request #146 from jameson-ernst/master

Fixes for trait ambiguity and num reform