Merge pull request #4 from JochemKuijpers/master

Accepted, thanks for contributing :)
Add desktop parser
Fix typo
Merge pull request #5 from WoutervdBrink/master

Add desktop parser
Merge pull request #6 from JochemKuijpers/master

Fixes a lot of issues with the new script
Merge pull request #1 from goldenice/master

Update from original