erorcun Merge pull request #1300 from erorcun/miami