Start of implementation of Version 2
Fix: protect Collection->get() inexistant rows
Merge branch 'v2.x'