the kitten is in the house
Merge branch 'master' into gh-pages