Page and Module now use extend method
Merge branch 'class'
merged branch and bumped version number