collection loader
codestyle fix
added require ConfigException
Merge remote-tracking branch 'origin/master'