updated
updates
Merge https://github.com/bkane11/python_tools