Improved custom builder lookup (issue#6)
Merge pull request #7 from mkubala/feature/moreElegantBuilderLookup

Improved custom builder lookup (solves #6)
Add a few more tests for special cases