Merge branch 'master' into develop
Removed unnecessary, commented-out coding.
Made the coding Python3.4 compatible.

I had to clarify a few data types so the interpreter was happy. Some
string handling also worked differently.
Merge branch 'develop'