Add better resolve method and tests for it
fix for flaxe8
Merge pull request #9 from mopidy/fix_for_issue7

Fix for issue #7