Added documentation
Merge in Tiles