initial
auto stuff bye bye
Merge branch 'master' into gh-pages