Sync pages with master

closes #284