updated 0.2.5
updated node modules.
Merge branch 'master' into gh-pages