Updat config + add Factory
Merge
Merge branch 'master' of github.com:MadCat34/ElasticSearch