#7 - use prefetch related to reduce number of queries
Merge branch 'release/1.0.3'