Initial commit
import
cleaning
Merge branch 'master' into gh-pages