Removed support for python2

- Needs to be tested further.
Merge branch 'develop'