Merge branch 'master', remote branch 'origin'
fixed export on windows with newline arg for file writer
Merge branch 'testing'
Merge branch 'master' of https://github.com/benjaminestes/Pyscape