local changes
Merge branch 'dev' of https://github.com/jameszuccollo/pydatafuncs into dev