Fix for non CMS pages
Merge pull request #116 from wshafer/master

Fix for non CMS pages