Fix & make into sane bash
Merge pull request #3 from kittylyst/master

Fixed