Merge pull request #3 from Sfynx/master

Import changes from BradCrumb/CakeDataGridder