Improve script
Merge pull request #7 from Mibuz/improvements/scripts

Improve script