Added lazy loading
Merge branch 'master' of http://github.com/ArneLammens/RD_Project