Modified few scripts
Merge branch 'master' of https://github.com/sm1234/w-etiqt