Update from Remote
Extract can die in fire, plus cleanup
Merge branch 'master', remote-tracking branch 'upstream/master'
Extract can die in fire, plus code cleanup
Merge pull request #8 from MikeHansenMe/master

Widget update