Added new resolver, fixed addons
Merge pull request #8 from ibv/master

Added new resolver, fixed addons