removed unused import that was screwing things up
Merge branch 'dev' of https://github.com/Venture-TheSphinxTeam/Sphinx into dev
Merge fix