Jasper Hugunin Merge pull request #28 from jashug/orm