Changed setup.py and __init__.py so setup.py install results are in line...

... with examples given in readme