rewite 0.1beta
Merge branch 'master' into gh-pages