Fix import error during setup.py install
Merge pull request #23 from stephenmcd/master

Fix import error during setup.py install