- adjusted the User-Agent to fit standard format
Fixed the merge conflicts caused by refactoring / deleted file.
Merge branch 'paynechu-master'
Merge pull request #26 from MoreTorpedoes/master

Done. A little messy (forgot to switch my local origins) but done :)