add 'create if not exist' for creating the schema
Merge remote-tracking branch 'upstream/master'