fml
Merge branch 'master' into gh-pages
update version and build