Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
changed some logic for chooseNextIcon()
Merge branch 'gh-pages'