Update shell script.
Simplify methods.
Merge pull request #458 from nZEDb/dev

Dev