Merge pull request #13 from adambrod/mergeBCFork

Add support for traits/types