Added CREATE TABLE support
fix merge
fix test