Sync pages with master

Closes #290