Corrected typos affecting python 3.x compatibility.
Merge pull request #17 from HapeMask/py3x-fixes

Corrected typos affecting python 3.x compatibility.
Revert mistakenly added change to py2 init function.
Merge pull request #18 from HapeMask/py3x-fixes

Revert mistakenly added change to py2 init function.
Merge branch 'orig'