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