Fix -e option
Merge branch 'master' of https://github.com/aiwas/misc
Update