File iteration changes and sa bit more stuff
Merge branch 'master' of github.com:ecoal95/clib