Updated files, added tox.ini