Merge changes from javajim75/master to gh-pages