Merge pull request #194 from mdlayher/master

Add nowplaying to settings, fix bug on settings change