All in one script.
Merge pull request #338 from nZEDb/dev

All in one script.