port changes from master branch
Merge branch 'RB2' of git@github.com:dmo60/lLyrics.git into RB2