moved python3 stuff to new branch
merge