Change variable name because of redefinition on Windows, closes #14
Change csv formatting to be more standard and consistent which close #15