modified:   cmparser.py
	modified:   zpoold.py
Merge branch 'master' of https://github.com/zagorulkinde/zpoold