revised 4/11/2013
Merge https://github.com/Mosai57/python-thing