fix issue with including unwanted files
Merge remote-tracking branch 'origin/master'
add object caching by default for lazyloaded objects
midways refactoring