Merge pull request #48 from kloesing/maxmind