Refs #4 replace queryset by mapping_type only if queryset is None
Merge pull request #5 from novapost/4-query-or-queryset

Refs #4 replace queryset by mapping_type only if queryset is None