Factory
Some improvements
World-wide connection to our DB
Merge remote-tracking branch 'origin/master'