Awaiting merge with ELorm
Merge branch 'master' of https://github.com/nicodee/minc