Made some improviments and changed script name