Add lazy flag to avoid circular reference
Merge pull request #42 from winzou/fix/lazy

Add lazy flag to avoid circular reference
Fixed some CS and composer update