#103 cleanup abstraction of file system resources
Merge remote-tracking branch 'origin/master'