Merge pull request #1 from michael-dev/master

Add @NS@ and @PAGE@ for namespace placeholders