Fix bug
Merge branch 'reusable'
Merge branch 'master' into gh-pages