cleanup and added messaging
Merge branch 'master' of github.com:Ricaz/NobelMediaPlayer