Issue 1

Merge issue 1 branch to master fixing lack of page variable on flexi templates