Fixed bug on hasher and style
Merge branch 'master' into gh-pages