diff --git a/README.md b/README.md
index 840751a..2adaef3 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ The version of Meraki-CLI documented here is: **1.0.2**
 
 -----------------------------------------
 ## ABOUT
-Meraki-CLI is a wrapper around the [Meraki Python Dashboard API SDK](https://github.com/meraki/dashboard-api-python). It takes all published functions in the library and makes them available to the user as a standard command-line tool with `-h` help options, commands, switches, and arguments. It also supports classic Linux-style pipelining, allowing the output of one instance of the program to be piped to the input of another.
+Meraki-CLI is a wrapper around the [Meraki Dashboard API Python SDK](https://github.com/meraki/dashboard-api-python). It takes all published functions in the library and makes them available to the user as a standard command-line tool with `-h` help options, commands, switches, and arguments. It also supports classic Linux-style pipelining, allowing the output of one instance of the program to be piped to the input of another.
 
 ### Examples
 
diff --git a/meraki-cli.py b/meraki-cli.py
index f42a253..3280ccb 100644
--- a/meraki-cli.py
+++ b/meraki-cli.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 
 
-'''
-Testing file. Run with 'python mcli.py <args>' to run tests on changes without
-    need to reinstall
-'''
+"""
+Testing file. Run with 'python meraki-cli.py <args>' to run tests on changes
+    without need to reinstall
+"""
 
 
 # mcli library
diff --git a/meraki_cli/__init__.py b/meraki_cli/__init__.py
index 64ca7f8..2658d09 100644
--- a/meraki_cli/__init__.py
+++ b/meraki_cli/__init__.py
@@ -2,11 +2,12 @@
 
 
 '''
-Main import file used when 'import meraki-cli'
+Main import file used when 'import meraki_cli'
 '''
 
 
 from . import __main__
+from .__main__ import *  # Make all the functions and classes available
 from . import __version__