Support python-2.x
Patched unit tests to be python 2.x compatible
Merge branch 'pmp-master'