running file fixup, adding functions
Merge branch 'dev'