update filepath stream
Merge branch 'master' into MacOSX