Applying changes on master

Applying every change has been made on 'gh-pages' for 'master'.