Merge change in gh-pages with master. All further development in master.