changes to use with base prototypes
Merge branch 'master' of git://github.com/DeltaPHP/Pages