cleaned up internal util
Merge branch 'master' into gh-pages
regen