Fix bug with '-e' flag in linux
Merge remote-tracking branch 'upstream/master'