fix for https://github.com/dasmoth/dalliance/issues/53
Merge remote-tracking branch 'origin/issue-53' into trait-hackathon