Adjusted version requirement
Aaargh, reverting accidental self-merge
Again
Merge pull request #2 from janimattiellonen/2.2-orm-update

2.2 orm update