Fixed problem of empty file.
Fixed permissions.
Merge remote branch 'github/master'