reverted; lazyload
Merge pull request #811 from luixxiul/development

reverted; lazyload