fix errors
Merge remote-tracking branch 'coyotte/design' into design
Merge branch 'design' into gh-pages