merging with master
Merge branch 'master' into gh-pages
compile
removing extra licence
Merge branch 'master' into gh-pages
merge gh-pages