Frota

Moving Frota modifications into master.