merge with  tgulacsi/goracle