Sync pages with master

Closes #287 
Closes #288