Merge pull request #31 from wshafer/master

Fix for test suite
Merge pull request #32 from wshafer/master

Fixed Render Order on pages