Merge branch 'master' into develop

pwhois

@@ -1,7 +1,10 @@
 #!/usr/bin/env python2
 
 import argparse, pythonwhois, json, datetime
-from collections import OrderedDict
+try:
+	from collections import OrderedDict
+except ImportError, e:
+	from ordereddict import OrderedDict
 
 parser = argparse.ArgumentParser(description="Retrieves and parses WHOIS data for a domain name.")
 parser.add_argument("-r", "--raw", action="store_true", help="Outputs raw WHOIS data and doesn't attempt to parse it. Segments are separated by a double-dash (--).")

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='pythonwhois',
-      version='2.0.1',
+      version='2.0.2',
       description='Module for retrieving and parsing the WHOIS data for a domain. Supports most domains. No dependencies.',
       author='Sven Slootweg',
       author_email='pythonwhois@cryto.net',