Merge pull request #1 from g4dpz/tiles

WIP
Merge branch 'master' into tiles
Added meta data