Pull from Development

Pulling this to the master repository to fix the missing code in the initial DerbyCon commit.