Merge pull request #93 from bouil/gh-pages

Update master from gh-pages.
Merge branch 'master' into gh-pages
angular 2 instead of beta 3