updates
Merge branch 'gh-pages' of https://github.com/jvrunion/core into gh-pages