fix for issue no. 28: lazy loading
Merge pull request #29 from Flipkart/master

Fix for issues No.28