Merge pull request #157 from doowb/master

Adding support for optional collections
updating to use page instead of currentPage in the root context. Updating test files to use the correct variable now.