John remote changes
Merge pull request #1 from d-eff/ffs

John remote changes