OSX and some fix
Merge branch 'draft'
github pages
Merge branch 'draft'