Changing directory before compression, code refactored.
Merge remote-tracking branch 'origin/master'