Merge

Merged master into gh-pages