Merge pull request #6 from jonathan-fielding/master

update-notifier
Merge pull request #1 from jackfranklin/master

Upstream changes