Merge branches 'schema_update' and 'estimation' of https://github.com/QRAAT/QRAAT into schema_update