Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
Added a simple README
Merge branch 'master' into gh-pages