some modifications
Merge branch 'master' of https://github.com/vulgur/python-tools