Updated gh-pages to release v1.4.0: fixed merge problem