Prettified code a bit
removed .sh on name
Merge pull request #1 from rufusroflpunch/master

A few changes