remove default-to-ephemeral switch extension
added check for 'documents' dir existence prior to copy
Merge branch 'fix'
Merge remote-tracking branch 'upstream/master'