Improves branch compilation.
Merge pull request #9 from tcr/tcr-branch

Improves branch compilation.