Merge pull request #387 from Annunaki/master

Edited the script to reflect more like the way it's currently handled "O...