[refs #2] Ensuring python 3 compatability
Merge branch 'master' into develop