added __File object mutators
Merge branch 'development'