Merge pull request #161 from stephenfin/python3-update

Python3 Update & General Refactoring of Codebase