Merged mateusd/firebird-support and made corrections