making package work with setup.py install
merged john's updates