first uncleared code (copied from previous projects)
Merge branch 'master' into gh-pages