Comments and testing
merge conflict
Merge branch 'gh-pages'