fixed bargrid issues
fixed bargrid issues
Merge branch 'master' into gh-pages