Merge branch 'dev'
Merge branch 'dev'
py3 working and fully tested
Merge branch 'dev'
docs updates