Made a few changes to file management after testing
Merge branch 'master' of https://github.com/lasiproject/LASI.git