rewrite the script
Merge pull request #67 from altundag/test-john

rewrite the script