Improved scripts.
Merge pull request #11 from crazymaster/issue11

Improve scripts