Merge pull request #1 from richardtynan/master

Merge with upstream
Add MCCMNC resolution
Merge pull request #2 from musalbas/master

MCCMNC resolution class