1 files changed, 20 insertions, 7 deletions
diff --git a/src/leap/__init__.py b/src/leap/__init__.py
index 99a951f..8846fbc 100644
--- a/src/leap/__init__.py
+++ b/src/leap/__init__.py
@@ -1,12 +1,25 @@
 # -*- encoding: utf-8 -*-
 
+__all__     = ['mx']
+__author__  = version.authors
+__version__ = version.getVersion()
+
 from leap import mx
-from leap import util
-from leap.util import version as mxversion
+from leap.mx import util
+from leap.mx.util import version
+
 
-__all__     = ['mx', 'util']
-__author__  = mxversion.authors
-__version__ = mxversion.getVersion()
+def _print_authors_nicely():
+    if hasattr(version, 'authors'):
+        assert isinstance(version.authors, list)
+        if len(version.authors) > 0:
+            first = version.authors.pop()
+            __author__ = (" ".join(first[:2]))
+            if len(version.authors) > 0:
+                for auth in version.authors:
+                    joined = " ".join(auth[:2])
+                    __author__ += ("\n%s" % joined)
+                    
 
-print "Authors: %s" % __author__
-print "Version: %s" % __version__
+print "Version: %s" % version.getVersion()
+print "Authors: %s" % _print_authors_nicely()