Changed some things around to submit to pypi - release 1.0