UPDATE: Idiorm + Paris added
Merge origin/master