Simplify shell code
Merge branch 'master' of github.com:chys87/scripts