uniqueID function instead of calling in many places
Merge branch 'master' into gh-pages