Merge pull request #77 from h15ter/master

Improve performance of overload resolution, fix various aspects of it