FIX #195
Merge pull request #201 from inthause/traits

FIX #195