Tiles fix, initial draft
Merge pull request #2 from acardenasnet/develop

Tiles fix, initial draft