Merge

Merged to gh-pages