Improved performance
Merge pull request #173 from seratch/feature/typebinder_performance_improvement

Improved performance